projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9484e9
)
upgrade: Actually deploy upgraded tree again
author
Colin Walters
<walters@verbum.org>
Thu, 16 May 2013 19:37:49 +0000
(15:37 -0400)
committer
Colin Walters
<walters@verbum.org>
Thu, 16 May 2013 19:38:17 +0000
(15:38 -0400)
I need a brown paper bag for this one...
src/ostree/ot-admin-builtin-upgrade.c
patch
|
blob
|
history
diff --git
a/src/ostree/ot-admin-builtin-upgrade.c
b/src/ostree/ot-admin-builtin-upgrade.c
index b060fbb92ffcee24faebe9499531dbdcc973e6fe..829e1beb5e76a9fda2d76e5fbe95f31ba4454d91 100644
(file)
--- a/
src/ostree/ot-admin-builtin-upgrade.c
+++ b/
src/ostree/ot-admin-builtin-upgrade.c
@@
-89,8
+89,10
@@
ot_admin_builtin_upgrade (int argc, char **argv, OtAdminBuiltinOpts *admin_opts,
gs_file_get_path_cached (ostree_dir),
NULL);
- if (!ot_admin_pull (ostree_dir, osname, cancellable, error))
- goto out;
+ if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir),
+ GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
+ cancellable, error,
+ "ostree", "admin", ostree_dir_arg, "pull-deploy", osname, NULL))
if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir),
GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,